rcar_gen3: drivers: ddr: Clean up printouts

Clean up the NOTICE() and FATAL_MSG() outputs, so that they contain
proper newlines and BL2 prefixes.

Signed-off-by: Marek Vasut <[email protected]>

diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
index 62997bc0d82421e9cd2d8acdaaf6b7b61af468e6..c289c88fd8b464e091be89bd4d5dbe32a6e72a15 100644 (file)
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
@@ -1137,13 +1137,13 @@ uint32_t recovery_from_backup_mode(void)
 
    /*  ddr backupmode end */
    if (ddrBackup) {
-      NOTICE("[WARM_BOOT]");
+      NOTICE("BL2: [WARM_BOOT]\n");
    } else {
-      NOTICE("[COLD_BOOT]");
+      NOTICE("BL2: [COLD_BOOT]\n");
    } /*  ddrBackup */
    err = rcar_dram_update_boot_status(ddrBackup);
    if (err) {
-      NOTICE("[BOOT_STATUS_UPDATE_ERROR]");
+      NOTICE("BL2: [BOOT_STATUS_UPDATE_ERROR]\n");
       return INITDRAM_ERR_I;
    } /*  err */
 
@@ -1672,9 +1672,9 @@ int32_t rcar_dram_init(void)
     md = *((volatile uint32_t*)RST_MODEMR);
     ddr = (md & 0x00080000) >> 19;
     if (ddr == 0x0) {
-       NOTICE("BL2: DDR1584(%s)", RCAR_E3_DDR_VERSION);
+       NOTICE("BL2: DDR1584(%s)\n", RCAR_E3_DDR_VERSION);
     } else if(ddr == 0x1){
-       NOTICE("BL2: DDR1856(%s)", RCAR_E3_DDR_VERSION);
+       NOTICE("BL2: DDR1856(%s)\n", RCAR_E3_DDR_VERSION);
     } /*  ddr */
 
     rcar_dram_get_boot_status(&ddrBackup);
@@ -1691,8 +1691,6 @@ int32_t rcar_dram_init(void)
         failcount = 1;
     } /*  dataL */
 
-    NOTICE("..%d\n", failcount); /*  rev.0.05 */
-
     if (failcount == 0) {
        return INITDRAM_OK;
     } else {

diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
index 78f0f114603b775a8251c65537c510151ffe7763..f4bfdde1c4fe6ae35198cc4263b9ce059e9d5335 100644 (file)
--- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
+++ b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
@@ -2826,7 +2826,7 @@ static uint32_t pll3_freq(uint32_t on)
        set_freqchgack(0);
 
        if (timeout) {
-               FATAL_MSG("Time out[2]");
+               FATAL_MSG("BL2: Time out[2]\n");
                return (1);
        }
        return (0);
@@ -3012,13 +3012,13 @@ static uint32_t init_ddr(void)
        ***********************************************************************/
 #ifdef DDR_BACKUPMODE
        if (ddrBackup) {
-               NOTICE("[WARM_BOOT]");
+               NOTICE("BL2: [WARM_BOOT]\n");
        } else {
-               NOTICE("[COLD_BOOT]");
+               NOTICE("BL2: [COLD_BOOT]\n");
        }
        err = rcar_dram_update_boot_status(ddrBackup);
        if (err) {
-               NOTICE("[BOOT_STATUS_UPDATE_ERROR]");
+               NOTICE("BL2: [BOOT_STATUS_UPDATE_ERROR]\n");
                return INITDRAM_ERR_I;
        }
 #endif